auto upstream
authorJoakim Verona <joakim@verona.se>
Fri, 28 Dec 2012 03:21:23 +0000 (04:21 +0100)
committerJoakim Verona <joakim@verona.se>
Fri, 28 Dec 2012 03:21:23 +0000 (04:21 +0100)

Trivial merge